Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add define for ADIOS2_HAVE_BP5 #1614

Merged
merged 7 commits into from
May 6, 2024

Conversation

franzpoeschel
Copy link
Contributor

This was removed from ADIOS2 v2.9 to v2.10, causing test failures in #1613 since openPMD thinks that BP5 does not exist, but ADIOS2 creates BP5 files.

This was removed from ADIOS2 v2.9 to v2.10.
franzpoeschel added a commit to franzpoeschel/picongpu that referenced this pull request Apr 25, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
franzpoeschel added a commit to franzpoeschel/picongpu that referenced this pull request Apr 26, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
@franzpoeschel franzpoeschel mentioned this pull request Apr 26, 2024
1 task
ikbuibui pushed a commit to ikbuibui/picongpu that referenced this pull request Apr 30, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
ikbuibui pushed a commit to ikbuibui/picongpu that referenced this pull request Apr 30, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
@franzpoeschel franzpoeschel merged commit b80dfee into openPMD:dev May 6, 2024
30 of 31 checks passed
@franzpoeschel
Copy link
Contributor Author

I accidentally merged this somehow, @ax3l will revert the merge commit and we'll try this once more.

@@ -19,6 +19,11 @@
#define openPMD_HAS_ADIOS_2_9 \
(ADIOS2_VERSION_MAJOR * 100 + ADIOS2_VERSION_MINOR >= 209)

#if !defined(ADIOS2_HAVE_BP5) && openPMD_HAS_ADIOS_2_9
// ADIOS2 v2.10 no longer defines this
#define ADIOS2_HAVE_BP5
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo: define our own macro instead of this

@@ -19,6 +19,11 @@
#define openPMD_HAS_ADIOS_2_9 \
(ADIOS2_VERSION_MAJOR * 100 + ADIOS2_VERSION_MINOR >= 209)

#if !defined(ADIOS2_HAVE_BP5) && openPMD_HAS_ADIOS_2_9
// ADIOS2 v2.10 no longer defines this
#define ADIOS2_HAVE_BP5
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's call this openPMD_HAS_ADIOS_BP5 and add all logic here (and rename other uses).

FilipO28555 pushed a commit to FilipO28555/picongpu that referenced this pull request May 9, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
FilipO28555 pushed a commit to FilipO28555/picongpu that referenced this pull request May 13, 2024
Fixed in openPMD-api by
openPMD/openPMD-api#1614. Versions that don't
have this fix will get confused and hand down their confusion to
PIConGPU.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants